Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

data: Huion Kamvas Pro 24 (GT-240, QHD) #654

Merged
merged 8 commits into from
Apr 19, 2024
Merged

data: Huion Kamvas Pro 24 (GT-240, QHD) #654

merged 8 commits into from
Apr 19, 2024

Conversation

AesaraB
Copy link
Contributor

@AesaraB AesaraB commented Apr 12, 2024

Adds #624
Requires #610

@AesaraB AesaraB changed the title Huion Kamvas Pro 24 (GT-240, QHD Huion Kamvas Pro 24 (GT-240, QHD) Apr 12, 2024
@AesaraB AesaraB mentioned this pull request Apr 15, 2024
3 tasks
@Eckoa
Copy link

Eckoa commented Apr 15, 2024

I managed to complete the tablet defenition file i posted here #624
with the PR from DIGImend/digimend-kernel-drivers#682

Im not familiar with how all this works so Im assuming the button codes wont change when that gets merged. If thats the case then we are only waiting on that and the touch strip bits to get merged so this should have the tablet definition pretty well done.


# Huion
# Kamvas Pro 24
# GT240
#
#
# Button Map:
# (A=1, B=2, C=3, ...)
#
#    *-----------------------*
#    |                       |
#  A |                       | K
#  B |                       | L
#  C |                       | M
#  D |                       | N
#  E |        TABLET         | O
#    |                       |
#    |                       |
#  F |                       | P
#  G |                       | Q
#  H |                       | R
#  I |                       | S
#  J |                       | T
#    |                       |
#    *-----------------------*
#
#
# Touch Strip Map:
# (a=strip min, A=strip max)
# Touch Strips are mirrored and do not map seperately
#
#    *-----------------------*
#    |                       |
#    |                       |
#    |                       |
#    |                       |
#    |                       |
#    |        TABLET         |
#  A |                       | A
#  a |                       | a
#    |                       |
#    |                       |
#    |                       |
#    |                       |
#    |                       |
#    |                       |
#    *-----------------------*

[Device]
Name=Huion Kamvas Pro 24
ModelName=GT240
DeviceMatch=usb:256c:006e:Tablet Monitor Pad;usb:256c:006e:Tablet Monitor Pen;usb:256c:006e:Tablet Monitor Touch Strip
Class=Cintiq
Width=21
Height=12
IntegratedIn=Display
Layout=huion-kamvas-pro-24.svg
Styli=@generic-no-eraser

[Features]
Stylus=true
Reversible=false
Touch=false
TouchSwitch=false
Ring=false
NumStrips=1

[Buttons]
Left=A;B;C;D;E;F;G;H;I;J
Right=K;L;M;N;O;P;Q;R;S;T
EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7,BTN_8,BTN_9;BTN_SOUTH;BTN_EAST;BTN_C;BTN_NORTH;BTN_WEST;BTN_Z;BTN_TL;BTN_TR;BTN_TL2;BTN_TR2

That tablet SVG should probably be done by somebody who is competent with inkscape as mine is definitely not well made as i have very little idea how to use it.

data/huion-kamvas-pro-24.tablet Outdated Show resolved Hide resolved
data/huion-kamvas-pro-24.tablet Outdated Show resolved Hide resolved
@AesaraB
Copy link
Contributor Author

AesaraB commented Apr 17, 2024

@Eckoa can you check if what I wrote matches your side of things?

@AesaraB AesaraB changed the title Huion Kamvas Pro 24 (GT-240, QHD) data: Huion Kamvas Pro 24 (GT-240, QHD) Apr 18, 2024
@AesaraB AesaraB marked this pull request as ready for review April 18, 2024 22:22
@AesaraB
Copy link
Contributor Author

AesaraB commented Apr 18, 2024

The tablet file works on my end. We can get someone else to test it, but I think the work on my side is done (the PR? Maybe not quite yet, there's still one more conversation to resolve).

@whot
Copy link
Member

whot commented Apr 19, 2024

svg needs to be renamed (see the commit I just punted on top) but there's still an issue left

Bail out! ERROR:../test/test-tablet-svg-validity.c:97:verify_has_class: assertion failed: (class_found (classes_present, *ptr++))

Looks like the SVG is missing something but unfortunately our svg checker is a bit rough, might be necessary to put some printfs in to figure out what is missing.

You can reproduce these failures locally btw running meson test -C builddir/

@AesaraB
Copy link
Contributor Author

AesaraB commented Apr 19, 2024

svg needs to be renamed (see the commit I just punted on top) but there's still an issue left

Bail out! ERROR:../test/test-tablet-svg-validity.c:97:verify_has_class: assertion failed: (class_found (classes_present, *ptr++))

Looks like the SVG is missing something but unfortunately our svg checker is a bit rough, might be necessary to put some printfs in to figure out what is missing.

You can reproduce these failures locally btw running meson test -C builddir/

There were some typos in the label classes. I don't have my development environment ready, so I'll test it later today if you haven't already.

Edit: looks like the automated tests are failing. Back at it I suppose
Edit 2: I undid your naming commit by mistake -- adding it back in.

@AesaraB
Copy link
Contributor Author

AesaraB commented Apr 19, 2024

Looks like the automated tests say we're happy. @whot still want me to test it on my side?

Edit: While I have you, do you want me to squash the commits into one when we get this ready to merge?

@whot
Copy link
Member

whot commented Apr 19, 2024

This LGTM now, thanks. Let's merge it and fix it later if need be. I'll squash them together, there's no real value in keeping the commits separate.

@whot whot merged commit 37b105e into linuxwacom:master Apr 19, 2024
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants